# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/07/13 10:58:21-06:00 bjorn.helgaas@hp.com # Merge hp.com:/home/helgaas/linux/linux-2.4 # into hp.com:/home/helgaas/linux/ia64-extras # # net/ipv4/netfilter/ip_fw_compat_masq.c # 2004/07/13 10:58:19-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # include/linux/pci.h # 2004/07/13 10:58:19-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # Documentation/Configure.help # 2004/07/13 10:58:19-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # Makefile # 2004/07/13 10:58:18-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # ChangeSet # 2004/07/12 21:59:50-07:00 davem@kernel.bkbits.net # Merge davem@nuts.davemloft.net:/disk1/BK/net-2.4 # into kernel.bkbits.net:/home/davem/net-2.4 # # Documentation/Configure.help # 2004/07/12 21:59:48-07:00 davem@kernel.bkbits.net +0 -0 # Auto merged # # ChangeSet # 2004/07/11 17:42:17-07:00 bunk@fs.tum.de # [IPV4]: Remove no longer available URL. # # This patch solves Bugzilla #2445 by removing a no longer available URL # from the help text for NET_IPIP. # # Noted by Nils Hammar . # # Signed-off-by: Adrian Bunk # Signed-off-by: David S. Miller # # Documentation/Configure.help # 2004/07/11 17:42:12-07:00 bunk@fs.tum.de +1 -2 # [IPV4]: Remove no longer available URL. # # This patch solves Bugzilla #2445 by removing a no longer available URL # from the help text for NET_IPIP. # # Noted by Nils Hammar . # # Signed-off-by: Adrian Bunk # Signed-off-by: David S. Miller # # ChangeSet # 2004/07/10 13:03:32-03:00 masanari.iida@hp.com # [PATCH] Fix harmless typo in drivers/char/sysrq.c # # This patch fix a typo in drivers/char/sysrq.c on 2.4.26. # # drivers/char/sysrq.c # 2004/07/09 16:58:07-03:00 masanari.iida@hp.com +1 -1 # Fix harmless typo in drivers/char/sysrq.c # # ChangeSet # 2004/07/09 17:05:35-07:00 tomd@csds.uidaho.edu # [CRYPTO]: Set CRYPTO_TFM_RES_BAD_KEY_LEN in twofish. # # crypto/twofish.c # 2004/07/09 17:05:29-07:00 tomd@csds.uidaho.edu +3 -0 # [CRYPTO]: Set CRYPTO_TFM_RES_BAD_KEY_LEN in twofish. # # ChangeSet # 2004/07/09 23:41:39+02:00 marcel@holtmann.org # [Bluetooth] Respond to L2CAP info requests # # This patch adds the correct behavior when a L2CAP info request is sent # by the peer. The answer should be a L2CAP info response with the result # code set to "not supported". # # net/bluetooth/l2cap.c # 2004/07/09 23:41:05+02:00 marcel@holtmann.org +40 -5 # Respond to L2CAP info requests # # include/net/bluetooth/l2cap.h # 2004/07/09 23:41:03+02:00 marcel@holtmann.org +8 -0 # Respond to L2CAP info requests # # ChangeSet # 2004/07/09 16:12:46-03:00 mikpe@csd.uu.se # [PATCH] cardbus.c pointer truncation bug on 64-bitters # # The 2.4 kernel's drivers/pcmcia/cardbus.c generates this compilation warning: # # cardbus.c:239: warning: implicit declaration of function `pci_scan_device_Raceae718' # cardbus.c:239: warning: assignment makes pointer from integer without a cast # # pci_scan_device() returns pci_dev*, but has no prototype in . # At the call site in cardbus.c (the only one not in pci.c), the compiler # must assume an 'int' return value and store that in a pci_dev* variable. # On a 64-bit machine with 32-bit int, this destroys the high 32 bits of # the original pointer. # # Trivial fix for 2.4.27-rc3 below. # # Signed-off-by: Mikael Pettersson # # include/linux/pci.h # 2004/07/07 16:48:53-03:00 mikpe@csd.uu.se +1 -0 # cardbus.c pointer truncation bug on 64-bitters # # ChangeSet # 2004/07/06 14:38:58-07:00 shemminger@osdl.org # [PKT_SCHED]: One small netem fixes. # # - optimize loss test so that net_random() call is not done # when no-loss is indicated # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # net/sched/sch_netem.c # 2004/07/06 14:38:40-07:00 shemminger@osdl.org +1 -1 # [PKT_SCHED]: One small netem fixes. # # - optimize loss test so that net_random() call is not done # when no-loss is indicated # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # ChangeSet # 2004/07/06 14:01:04-07:00 shemminger@osdl.org # [PKT_SCHED]: Update to network emulation QOS scheduler. # # This is the 2.4 version of the conversion of simply network delay # scheduler to network emulator. # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # net/sched/Makefile # 2004/07/06 14:00:41-07:00 shemminger@osdl.org +1 -1 # [PKT_SCHED]: Update to network emulation QOS scheduler. # # This is the 2.4 version of the conversion of simply network delay # scheduler to network emulator. # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # net/sched/Config.in # 2004/07/06 14:00:41-07:00 shemminger@osdl.org +1 -1 # [PKT_SCHED]: Update to network emulation QOS scheduler. # # This is the 2.4 version of the conversion of simply network delay # scheduler to network emulator. # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # include/linux/pkt_sched.h # 2004/07/06 14:00:40-07:00 shemminger@osdl.org +8 -5 # [PKT_SCHED]: Update to network emulation QOS scheduler. # # This is the 2.4 version of the conversion of simply network delay # scheduler to network emulator. # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # net/sched/sch_netem.c # 2004/07/06 14:00:26-07:00 shemminger@osdl.org +255 -0 # [PKT_SCHED]: Update to network emulation QOS scheduler. # # This is the 2.4 version of the conversion of simply network delay # scheduler to network emulator. # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # net/sched/sch_netem.c # 2004/07/06 14:00:26-07:00 shemminger@osdl.org +0 -0 # BitKeeper file /disk1/BK/net-2.4/net/sched/sch_netem.c # # BitKeeper/deleted/.del-sch_delay.c~bacd03902b785edf # 2004/07/06 13:59:25-07:00 davem@nuts.davemloft.net +0 -0 # Delete: net/sched/sch_delay.c # # ChangeSet # 2004/07/05 16:34:08-07:00 vandrove@vc.cvut.cz # [VLAN]: Do not access released memory. # # net/8021q/vlan_dev.c # 2004/07/05 16:34:03-07:00 vandrove@vc.cvut.cz +1 -1 # [VLAN]: Do not access released memory. # # ChangeSet # 2004/07/05 15:37:21-07:00 jaap.keuter@xs4all.nl # [IPV4]: Calculate default broadcast even when using SIOCSIGNETMASK. # # While getting hands-on with netkit (www.netkit.org), a networking # simulation environment based on UML, it struck me that ifconfig wasn't # capable of calculating the proper broadcast address for a subnetted # interface. Some browsing through newsgroups and on the Debian package # site (nettools), showed that this leads to misconfigured interfaces and # a couple of bugreports on ifconfig. # # Digging a bit deeper revealed that it actually is an issue with # SIOIFNETMASK. Once you bring up an interface with SIOIFADDR, a classfull # netmask and broadcast address is set (if applicable for the type of # interface), in order to get a properly configured interface. But if you # subnet the network using SIOIFNETMASK no proper broadcast address is # set. So you always have to calculate it yourself, obviously leading to # configuration errors. # # This patch takes care of this. First of all it doesn't change # existing functionality, eg. a command like 'ifconfig eth0 192.168.1.1 # netmask 255.255.255.240 broadcast 192.168.1.0' still works. But if you # omit the broadcast address, a proper 'all ones' broadcast address for the # subnet is set. 'ifconfig eth0 192.168.1.1 netmask 255.255.255.240' gives # you 'eth0 inet addr:192.168.1.1 Bcast:192.168.1.15 Mask:255.255.255.240' # and this should solve some real life problems. # # Signed-off-by: Jaap Keuter # Signed-off-by: David S. Miller # # net/ipv4/devinet.c # 2004/07/05 15:37:04-07:00 jaap.keuter@xs4all.nl +17 -1 # [IPV4]: Calculate default broadcast even when using SIOCSIGNETMASK. # # While getting hands-on with netkit (www.netkit.org), a networking # simulation environment based on UML, it struck me that ifconfig wasn't # capable of calculating the proper broadcast address for a subnetted # interface. Some browsing through newsgroups and on the Debian package # site (nettools), showed that this leads to misconfigured interfaces and # a couple of bugreports on ifconfig. # # Digging a bit deeper revealed that it actually is an issue with # SIOIFNETMASK. Once you bring up an interface with SIOIFADDR, a classfull # netmask and broadcast address is set (if applicable for the type of # interface), in order to get a properly configured interface. But if you # subnet the network using SIOIFNETMASK no proper broadcast address is # set. So you always have to calculate it yourself, obviously leading to # configuration errors. # # This patch takes care of this. First of all it doesn't change # existing functionality, eg. a command like 'ifconfig eth0 192.168.1.1 # netmask 255.255.255.240 broadcast 192.168.1.0' still works. But if you # omit the broadcast address, a proper 'all ones' broadcast address for the # subnet is set. 'ifconfig eth0 192.168.1.1 netmask 255.255.255.240' gives # you 'eth0 inet addr:192.168.1.1 Bcast:192.168.1.15 Mask:255.255.255.240' # and this should solve some real life problems. # # Signed-off-by: Jaap Keuter # Signed-off-by: David S. Miller # # ChangeSet # 2004/07/03 19:29:45-03:00 marcelo@logos.cnet # Add missing bracket to inode_change_ok() fix # TAG: v2.4.27-rc3 # # fs/attr.c # 2004/07/03 19:28:29-03:00 marcelo@logos.cnet +1 -1 # Add missing bracket to inode_change_ok() fix # # ChangeSet # 2004/07/03 18:35:27-03:00 marcelo@logos.cnet # Changed EXTRAVERSION to -rc3 # # Makefile # 2004/07/03 18:35:01-03:00 marcelo@logos.cnet +1 -1 # Changed EXTRAVERSION to -rc3 # # ChangeSet # 2004/07/03 18:32:40-03:00 marcelo@logos.cnet # Thomas Biege: Fix missing DAC check on sys_chown # # fs/attr.c # 2004/07/03 18:28:30-03:00 marcelo@logos.cnet +1 -0 # Thomas Biege: Fix missing DAC check on sys_chown # # ChangeSet # 2004/07/02 08:51:41-03:00 trini@kernel.crashing.org # [PATCH] Li Yang: PQII FCC Ethernet driver: transmit buffer leak # # From: Li Yang-r58472 # To: 'Tom Rini' # Cc: 'Paul Mackerras' # # When PQII FCC Ethernet runs under heavy tx load. The tx ring buffer will be overflowed. As there is no overflow judgment for the spare buffer size. Overflowed skb pointer will overwrite un-transfered skb pointer that makes those skbs never be freed. The memory leak is substantial. And will eventually crash the linux system. # # This is fixed in linux-2.6.7. And I have pulled the fix to linux-2.4. The bug is kind of serious to PQII embedded systems. Therefore, it is important that it is fixed in next 2.4 releases. Could you please submit it to the maintainer of 2.4? # # arch/ppc/cpm2_io/fcc_enet.c # 2004/06/28 06:02:19-03:00 trini@kernel.crashing.org +13 -3 # Li Yang: PQII FCC Ethernet driver: transmit buffer leak # # ChangeSet # 2004/06/29 22:30:55-07:00 ajgrothe@yahoo.com # [CRYPTO]: Add TEA and XTEA algorithms. # # The following is a patch against 2.6.7 (should apply cleanly to 2.6.5 or # above). It implements the Tiny Encryption Algorithm (TEA) and the # Xtended TEA (XTEA) algorithms. TEA goes back to 1994 and is a good # algorithm espically for memory constrained systems. It is similar in # concept to the IDEA crypto. It does NOT have any patent restrictions # and has been put in the public domain by Wheeler and Needham. Tea is used # in quite a few products such as filesafe and even Microsoft's Xbox. # # Signed-off-by: Aaron Grothe # Signed-off-by: James Morris # Signed-off-by: David S. Miller # # crypto/tcrypt.h # 2004/06/29 22:30:46-07:00 ajgrothe@yahoo.com +190 -0 # [CRYPTO]: Add TEA and XTEA algorithms. # # The following is a patch against 2.6.7 (should apply cleanly to 2.6.5 or # above). It implements the Tiny Encryption Algorithm (TEA) and the # Xtended TEA (XTEA) algorithms. TEA goes back to 1994 and is a good # algorithm espically for memory constrained systems. It is similar in # concept to the IDEA crypto. It does NOT have any patent restrictions # and has been put in the public domain by Wheeler and Needham. Tea is used # in quite a few products such as filesafe and even Microsoft's Xbox. # # Signed-off-by: Aaron Grothe # Signed-off-by: James Morris # Signed-off-by: David S. Miller # # crypto/tcrypt.c # 2004/06/29 22:30:46-07:00 ajgrothe@yahoo.com +20 -1 # [CRYPTO]: Add TEA and XTEA algorithms. # # The following is a patch against 2.6.7 (should apply cleanly to 2.6.5 or # above). It implements the Tiny Encryption Algorithm (TEA) and the # Xtended TEA (XTEA) algorithms. TEA goes back to 1994 and is a good # algorithm espically for memory constrained systems. It is similar in # concept to the IDEA crypto. It does NOT have any patent restrictions # and has been put in the public domain by Wheeler and Needham. Tea is used # in quite a few products such as filesafe and even Microsoft's Xbox. # # Signed-off-by: Aaron Grothe # Signed-off-by: James Morris # Signed-off-by: David S. Miller # # crypto/Makefile # 2004/06/29 22:30:46-07:00 ajgrothe@yahoo.com +1 -0 # [CRYPTO]: Add TEA and XTEA algorithms. # # The following is a patch against 2.6.7 (should apply cleanly to 2.6.5 or # above). It implements the Tiny Encryption Algorithm (TEA) and the # Xtended TEA (XTEA) algorithms. TEA goes back to 1994 and is a good # algorithm espically for memory constrained systems. It is similar in # concept to the IDEA crypto. It does NOT have any patent restrictions # and has been put in the public domain by Wheeler and Needham. Tea is used # in quite a few products such as filesafe and even Microsoft's Xbox. # # Signed-off-by: Aaron Grothe # Signed-off-by: James Morris # Signed-off-by: David S. Miller # # crypto/Config.in # 2004/06/29 22:30:46-07:00 ajgrothe@yahoo.com +1 -0 # [CRYPTO]: Add TEA and XTEA algorithms. # # The following is a patch against 2.6.7 (should apply cleanly to 2.6.5 or # above). It implements the Tiny Encryption Algorithm (TEA) and the # Xtended TEA (XTEA) algorithms. TEA goes back to 1994 and is a good # algorithm espically for memory constrained systems. It is similar in # concept to the IDEA crypto. It does NOT have any patent restrictions # and has been put in the public domain by Wheeler and Needham. Tea is used # in quite a few products such as filesafe and even Microsoft's Xbox. # # Signed-off-by: Aaron Grothe # Signed-off-by: James Morris # Signed-off-by: David S. Miller # # Documentation/Configure.help # 2004/06/29 22:30:46-07:00 ajgrothe@yahoo.com +11 -0 # [CRYPTO]: Add TEA and XTEA algorithms. # # The following is a patch against 2.6.7 (should apply cleanly to 2.6.5 or # above). It implements the Tiny Encryption Algorithm (TEA) and the # Xtended TEA (XTEA) algorithms. TEA goes back to 1994 and is a good # algorithm espically for memory constrained systems. It is similar in # concept to the IDEA crypto. It does NOT have any patent restrictions # and has been put in the public domain by Wheeler and Needham. Tea is used # in quite a few products such as filesafe and even Microsoft's Xbox. # # Signed-off-by: Aaron Grothe # Signed-off-by: James Morris # Signed-off-by: David S. Miller # # crypto/tea.c # 2004/06/29 22:29:33-07:00 ajgrothe@yahoo.com +248 -0 # # crypto/tea.c # 2004/06/29 22:29:33-07:00 ajgrothe@yahoo.com +0 -0 # BitKeeper file /disk1/BK/net-2.4/crypto/tea.c # # ChangeSet # 2004/06/29 16:14:54-07:00 shemminger@osdl.org # [BRIDGE]: Bridge STP message age # # This is the 2.4 version which incorporates the observations from Kishore # about 2.6. The existing 2.4 code set the age properly, but did not increment # correctly for HZ=1000 and could send a stale (expired) configuration. # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # net/bridge/br_stp.c # 2004/06/29 16:14:48-07:00 shemminger@osdl.org +15 -10 # [BRIDGE]: Bridge STP message age # # This is the 2.4 version which incorporates the observations from Kishore # about 2.6. The existing 2.4 code set the age properly, but did not increment # correctly for HZ=1000 and could send a stale (expired) configuration. # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/28 15:33:58-07:00 hch@lst.de # [NETLINK]: Fix NLMSG_OK/RTA_OK length checking. # # Verify at least a full header is there before derefencing # length struct member. # # include/linux/rtnetlink.h # 2004/06/28 15:33:45-07:00 hch@lst.de +2 -1 # [NETLINK]: Fix NLMSG_OK/RTA_OK length checking. # # Verify at least a full header is there before derefencing # length struct member. # # include/linux/netlink.h # 2004/06/28 15:33:45-07:00 hch@lst.de +2 -1 # [NETLINK]: Fix NLMSG_OK/RTA_OK length checking. # # Verify at least a full header is there before derefencing # length struct member. # # ChangeSet # 2004/06/28 13:21:54-07:00 jbglaw@lug-owl.de # [NETFILTER]: ip_fw_compat_masq.c needs net/ip.h # # net/ipv4/netfilter/ip_fw_compat_masq.c # 2004/06/28 13:21:51-07:00 jbglaw@lug-owl.de +1 -0 # [NETFILTER]: ip_fw_compat_masq.c needs net/ip.h # # ChangeSet # 2004/06/27 20:41:08-07:00 davem@nuts.davemloft.net # [NET]: Fix SO_{RCV,SND}TIMEO getsockopt handling. # # A microsecond is 1 millionth of a second not # 1 thousandth of a second. # # Noticed by Markus Mottl # # Signed-off-by: David S. Miller # # net/core/sock.c # 2004/06/27 20:40:53-07:00 davem@nuts.davemloft.net +2 -2 # [NET]: Fix SO_{RCV,SND}TIMEO getsockopt handling. # # # A microsecond is 1 millionth of a second not # 1 thousandth of a second. # # Noticed by Markus Mottl # # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/27 20:10:03-03:00 bunk@fs.tum.de # [PATCH] add missing USB Gadget Configure.help entries # # The patch below adds some Configure.help entries that are missing from # 2.4.27-rc2 (all help texts are stolen from 2.6). # # Please apply # Adrian # # Documentation/Configure.help # 2004/06/26 09:47:47-03:00 bunk@fs.tum.de +21 -0 # add missing USB Gadget Configure.help entries # diff -Nru a/Documentation/Configure.help b/Documentation/Configure.help --- a/Documentation/Configure.help 2004-07-14 15:22:28 -07:00 +++ b/Documentation/Configure.help 2004-07-14 15:22:28 -07:00 @@ -18771,6 +18771,11 @@ purpose port, say Y here. See . +Support for serial ports defined in ACPI namespace +CONFIG_SERIAL_ACPI + If you wish to enable serial port discovery via the ACPI + namespace, say Y here. If unsure, say N. + Support for PowerMac serial ports CONFIG_MAC_SERIAL If you have Macintosh style serial ports (8 pin mini-DIN), say Y diff -Nru a/Makefile b/Makefile --- a/Makefile 2004-07-14 15:22:28 -07:00 +++ b/Makefile 2004-07-14 15:22:28 -07:00 @@ -93,6 +93,7 @@ CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \ -fno-strict-aliasing -fno-common +CFLAGS += -g ifndef CONFIG_FRAME_POINTER CFLAGS += -fomit-frame-pointer endif @@ -307,8 +308,7 @@ $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in xconfig: symlinks - $(MAKE) -C scripts kconfig.tk - wish -f scripts/kconfig.tk + @echo -e "***\n* Sorry, xconfig is broken; use \"make menuconfig\" instead.\n***" menuconfig: include/linux/version.h symlinks $(MAKE) -C scripts/lxdialog all